Skip to content

Qtfred ship weapons dialog#7453

Merged
wookieejedi merged 17 commits into
scp-fs2open:masterfrom
MjnMixael:qtfred-ship-weapons-dialog
May 16, 2026
Merged

Qtfred ship weapons dialog#7453
wookieejedi merged 17 commits into
scp-fs2open:masterfrom
MjnMixael:qtfred-ship-weapons-dialog

Conversation

@MjnMixael
Copy link
Copy Markdown
Contributor

@MjnMixael MjnMixael commented May 12, 2026

Upgrades and refactors the ships weapons subdialog. Enables multi edit, drag-and-drop controls of a ship's weapons with several quality of life features such as visually showing which weapons are allowed for a particular ship. Finishes TheForce172's work and brings the final subdialog in line with the rest.

Tests show it working as expected.

The last of what's needed and Fixes #6973

@MjnMixael MjnMixael added this to the Release 26.0 milestone May 12, 2026
@MjnMixael MjnMixael added the qtfred A feature or issue related to qtFred. label May 12, 2026
@github-project-automation github-project-automation Bot moved this to Work In Progress (PRs) in qtFRED2 May 12, 2026
const int id;
const bool allowed;
};
class WeaponModel : public QAbstractListModel {
Copy link
Copy Markdown
Contributor

@TheForce172 TheForce172 May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kind of concerned here that we're breaking the no QT code in models rule. I thought the model code was supposed to be UI agnostic.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof. Yeah. I've been neck deep in new feature code in just qt widgets so long that I wasn't paying attention. Good catch. I've redone it with a better model/ui split.

@MjnMixael MjnMixael force-pushed the qtfred-ship-weapons-dialog branch from 8a1502a to 9fb58a9 Compare May 14, 2026 00:17
Copy link
Copy Markdown
Member

@wookieejedi wookieejedi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With recent push fixing the turret weapon selection this now looks good

@github-project-automation github-project-automation Bot moved this from Work In Progress (PRs) to In Review (PRs) in qtFRED2 May 15, 2026
@wookieejedi wookieejedi merged commit b4c5c7b into scp-fs2open:master May 16, 2026
20 checks passed
@github-project-automation github-project-automation Bot moved this from In Review (PRs) to Done in qtFRED2 May 16, 2026
@MjnMixael MjnMixael deleted the qtfred-ship-weapons-dialog branch May 16, 2026 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

qtfred A feature or issue related to qtFred.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Revise Editor: Ships

3 participants